Updated tests, which fail, to compile against the new project design.