remove/update comments
decrease timeout
test refactoring