Finished up unit and functional tests, started creating feature test framework/