add Resource Map tests and some fixes to make some of them work