Added: IUnloadable interface
Changed: Test function names