tests all pass now