Reverted to basic tests.