Fixed some non-fatal test errors
Updated NRefactory