Started work on a test suite