ore tests and small fixes