halfway fix unit tests