Finished test. Bug fixes.