Preparing More Tests

not a significant commit. Can ignore
fixed some bugs with writing to the disk