Getting closer to making test pass