Remove unused action
Fix some spacing
Use sequences to reduce test data duplication