unit tests
functional tests added