Added tests for new features