Added some temporary hacks to make things work for a test.