Added resource test and made existing tests more stringent