Fixed bug with duplicate ticking and added tests for the same