Close #14 fixed issues with unit/integration failing