Added tests and done some rearrangements of tests
Updated tests