Added unit tests for new features