Adapted tests to latest design changes (ouch...)