non-orm changes and tests