Small fixes and a test file