New test, small fixes