Refactor solutions for easier testing (WIP)