376 - fixing unit tests