Added everything needed for solution
Made more tests
Removed solution