Add tests for the remaining files