Made tests Python 2/3 compatible
Removed unnecessary test files