Crytogram manager tests

Did some cleanup and added more tests