added tests, better answer counting