fixin unit tests