fixes for tests + add new tests