Some software rendering tests and bug fix