Tests: Get all tests passing

Many of them were out of date (gasp! how could I let that happen?)