Functional tests to unit tests
 Merge branch 'develop' into 'master'

Move functional tests to unit tests

Tests in tests/functional are actually unit tests. Move then into tests/unit.