New test, some fixes.