starting to align tests with London_hackathon branch