Added testing for a whole bunch of stuff.