Adding further unit tests