fixed tests
tests added/updated