Fleshed out BugTest

- Also a bunch of small things.