For #31 split up tests between unit and integration started namespacing tests, got some passing'