Added more tests for func-style