Refactor tests
Delete an unused method
Add a condition which depends on label's value