Implement additional unit tests