Moar workarounds, tests