Update tests to latest best practices