more extensive testing
make solution correct