Small fixes
Better test coverage