Add new unit tests
Move specification extensions