Refactor testing tutorial as discussed in meeting