Fixed tests and improved unloader