Adding test suite...still some ways to go.