everything works, fixed tests