Small changes, started unittest
missing hierarchy