Updated tests and added new Tests for CustomActions