Unit tests basically working now.