Fixed up tests slightly, need to implement convenience method