FIXED BUG: Comments in actions and added tests