Updated unit tests
Improved tick labelling mechanism