updated 18, added test files for 18 and 67