remove test fix to allow merge