Some small fixes with unit testing