resolve remarks and enhance unit tests