More tests.

More tests, fixed old busted tests, fixed some style issues.