add comments
make test for under construction even stricter