Cleared up some testing/coding inconsistencies