Testability (#2)
A bit of tests (#2)