Added more tests

+General fixes