Add tests for separate