Add some stuff to unit test
More bug squashing