Fixed some tests, corrected some problems.