more test, and removed non tested features