had fun with py.test, also started to style stuff properly