Adapted tests to new design