Improve testing ever so slightly and ensure passing