Simplified test
Create action, some refactoring