small fixes, new tests
basic test