Added tests for features