Some more tests, need to refactor the action mechanisms