Chore/tests

Lots of test updates; section at the bottom has problem/unfinished areas that I'll update tonight/ tomorrow, unless you guys think they aren't necessary. @mrgordon @arvel @maj @syrnick