updated / added some tests