fix broken test, general progress