By moving tests into another file, I found some failures to prototype some functions -- huzzah for testing