Fix includes and test cases