both tests run now, pretty ugly