Some minor reformatting

Change-Id: If5c84a661a7ad62a9b94af3edd2797c33962e612
Piping through autopep8

Change-Id: Ied94590d81bfd9ee5af0dea7c8974677f33ed7b0
Remove unitests FIXME

Change-Id: I053594e238bab681490cfbc41d4da7b941fc9d70