Merging resources and tests from day 2.