Stefan Andersson

Hi, Fixed the assert and added a unittest for it, sry for all the extra commits, fucked up with some new stuff that will come in another commit, and did...