Style cleanup

Change-Id: I10f984a3b2594a1d1a4e98d637f5dcc0e1a8dc5b
Updated tox configuration moved to py.test

Change-Id: I5561cea7b51db3627e70b5cf1f522127c5d739f5