Updated testing fixtures