Fixed style / re-added unit test