Two merge error fixed, and testsuite updated to removed some other
test failues.
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>