Reverted to old tests