Reverted to initial tests