Added more tests for stages