first big batch of tests, run useing nosetests
added more tests