Tests cleanup

 * removing useless tests
 * pep8 fix

Change-Id: I5ac8b5251a4836bf1941ffd0982b6377fe2e0e2b