Finished functional tests and have the first few intergration tests passing