Some unit tests for the improvements made today