First stab at incorporating integration tests