Upgraded tests to meet cake3 requirements