Fixing test exercises