Moving to integration style testing and fixing some bugs.