More tests and cleaned up some ancient code

It actually referenced the INI file, lolno.