- added bunch more tests