Fixed some tests.
Getting closer on tests.