Cleanup 3.0 branch and re-introduce tests