Started work on Unit tests