Tidy up + more tests
Introduce evolution test