FIX: Made all tests green again.
RFT: Many code formattings