MovieClip fixes and unit tests