Integration tests and features refactoring