* written first test
* minor improvements