Fixed/added unit test