Updated test cases. Build successful