make correct + fix tests