added more tests from spec
added more tests from spec-trying again