Start writing test/server tests and fixing things.