add more tests; fix tests names