Adding feature tests

Add feature tests