Slight changes.. added a few more tests..

Have 1 error and 3 failures in testconference.. can't figure them out