added more tests and fixed some
merge