Added more tests (first tests for features)