Adding tests back