minor changes to actions to make them more consistant
minor changes to tests