Putting my version of tests back