Remove unused classes, add missing tests, change app package name