Moved tests to the proper package.
Moved tests to the proper package, removed some warnings and redundant
classes.