Updating tests with changed behaviors and JMX fix