Added KDF unit tests to suite
Removed last references to ApiUsageError
Removed most 'import *' statements