Improve assertion stuff
Fix test??