Added Button
Fixed references to UnitTest_rstring