Changed Types, updated unit tests