added tests
fixed specs