updated the spectests and removed the if statements.