Expanded tests

Expanded some tests and added skeletons for others and an extra user
story.
-currently tempDir.delete() clauses are placed at the end, but they are
not working as intended.