Fixed the first unit tests