cleaning up unit test
renaming vars; +unit tests