Pretest

Added in 5 tests and didn't break the master!