added old tests back in