Minor bug fixes / RUP unittest