Fixes in Component.swf and Unittests