Adds AndySmith78's testing shortcuts