another stab at passing tests