starting to resolve unit tests