Clean up and add push test cases