changed data types + fixed unit tests
fixed unit test