fixed tests/bugs and ran grunt