Fixin' bugs & cheersin' thugs

More content for test script and finding bugs in DB as I go