Re-write of spec test