Fix brainfarts and make tests ready to be written