Added new helpers

- Finished up the TimeBasedGroup finder
- Fixed some missing calls in ApiSinEntry
Fixed test failures before push