Finishing touches and got tests to run again.