13 - fixing unit tests