Swap email
Use TSK with an extra guard added
Move partition reading calls to main()
Add default testing image