Fix some weird stuff in development/test

See commit messages for what/why.