Update tests
Update to lists instead of strings
Solving functional