prettied up tests, converted to assert_eq!