Style fixes & more tests