mo tests and small fixes