finished out the main test file, and squashed a few bugs