Added further unit tests