add further unit tests