Fixed tests ending early