bug fixes/more check 18 tests