Updated tests to include resolution