Add proper disposal to test