Revert "Revert "Refactor Permissions tests into 2 seperate classes""

This reverts commit f67bc94a65e170ded7782a4497386d939e4db401.
run all tests except api permissions

Change-Id: I39a1ed4a86f2a813fa68cd4fdfa84ab96baa67f7