Some fixes
Add test1 solutions