corrections && tests