current progress fixing unit tests