Fixed tests so they can run in main.
Responded to some questions in ryhthm