added old tests back