Updated test cases to enable them run independently.