Tried my best to fix whitespace changes in conjurer. Also added tests for my code