Started work on unit test stuff