added more unit tests

tweaked the spec a bit too