Issue 225 and 226 test in isolated