Re-organized tests. Fixed ordering of asserts