Add test file and make some fixes in definitions