Unit tests refactored into normal package structure (a few not moved yet)