Updated readme
Fixed ordering of assertion funcs
Renamed test methods for better clarity
Merge branch 'cleanup'