Update tests to comply with spec