Merged tests

Create test for the features generated in last step
Simone Cohen (scc)