Added tests for feature 0