updated tests
fixed minor bug