Added functional tests
Started on some tests
Merge branch 'master' of https://github.com/ColCarroll/cross_tracker