Fixed last merge file from "tests" folder to new "api" folder

Also fixed the import to work with new directory structure

(updated to fix pep8 ordering issue)

Change-Id: I1403001268cdbbec2f4a395d062fee11bfc22e9c
Merge "Fixed last merge file from "tests" folder to new "api" folder"