Basic testing + fixes + formatting