removed unused things
made the tests more flexible
corrected tests