Some API test cleanup
Merge pull request #391 from artcompiler/tests

Some API test cleanup