saving some tests (branch to be removed)