Added a few more tests + incorporated Paloa's 19199 and 19198