added further unit tests