fixed tests broken by ui changes so far; disabled tests for things I haven't yet changed