refactor tests and remove comments