a bit of clean up and adding basic tests to talk about