fixed regression with dynamic updates
added new test case for dynamic changes
Added some helper methods