Moved solution to separate package
Removed unused test