Preparing More Tests

not a significant commit. Can ignore