Finished more tests up to and including 20 except for 15 and 18