better tests! more coverage!