unit tests consolidated