Fix up post requires and some tests