Finally adds some tests and mass stylings