Working further on unit tests