More tests, restored accidently deleted file.