Repaired initial tests