tests: improve testing by splitting tests + use six for basestring python3 compatibility