updated tests, fixed a few glitches and spec deficiencies