Some work on Unit Tests