diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..bbb25bf
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+IMAGE_NAME = nginx
+
+MODULEMDURL=file://nginx.yaml
+
+default: run
+
+build:
+	docker build --tag=$(IMAGE_NAME) .
+
+run: build
+	docker run -d $(IMAGE_NAME)
+
+test: build
+	cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all
+	cd tests; MODULE=rpm MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all
diff --git a/nginx.yaml b/nginx.yaml
index 17f47df..a913cf3 100644
--- a/nginx.yaml
+++ b/nginx.yaml
@@ -1,45 +1,53 @@
-document: modulemd-packager
-version: 3
+document: modulemd
+version: 1
 data:
-  summary: nginx webserver
-  description: nginx webserver 1.20 stream
-  license:
-    - MIT
-  configurations:
-    - context: "8b234a03"
-      platform: eln
-    - context: "5e5ad4a0"
-      platform: f36
-    - context: "9e842022"
-      platform: f37
-    - context: "f38"
-      platform: f38
-    - context: "f39"
-      platform: f39
-  references:
-    documentation: http://nginx.org/en/docs/
-    tracker: https://trac.nginx.org/nginx/
-  profiles:
-    common:
-      rpms:
-        - nginx
-        - nginx-all-modules
-    minimal:
-      rpms:
-        - nginx-core
-  api:
-    rpms:
-      - nginx
-      - nginx-all-modules
-      - nginx-core
-      - nginx-filesystem
-      - nginx-mod-http-image-filter
-      - nginx-mod-http-perl
-      - nginx-mod-http-xslt-filter
-      - nginx-mod-mail
-      - nginx-mod-stream
-  components:
-    rpms:
-      nginx:
-        rationale: nginx package
-        ref: stream-1.20
+    summary: nginx webserver
+    description: an initial version of the nginx webserver module
+    license:
+        module: [ MIT ]
+    dependencies:
+        buildrequires:
+            base-runtime: master
+        requires:
+            base-runtime: master
+    references:
+        community: https://docs.pagure.org/modularity/
+        documentation: https://github.com/container-images/nginx
+        tracker: https://github.com/container-images/nginx
+    profiles:
+        default:
+            rpms:
+                - nginx
+    api:
+        rpms:
+            - nginx
+    components:
+        rpms:
+            nginx:
+                rationale: Provides API for this module.
+                ref: f26
+
+            gperftools:
+                rationale: dependency
+                ref: f26
+            libmnl:
+                rationale: dependency
+                ref: f26
+            libnetfilter_conntrack:
+                rationale: dependency
+                ref: f26
+            libnfnetlink:
+                rationale: dependency
+                ref: f26
+            libunwind:
+                rationale: dependency
+                ref: f26
+            libxkbcommon:
+                rationale: dependency
+                ref: f26
+            mailcap:
+                rationale: dependency
+                ref: f26
+            xkeyboard-config:
+                rationale: dependency
+                ref: f26
diff --git a/sources b/sources
new file mode 100644
index 0000000..e69de29
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..fa94987
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,7 @@
+MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py
+CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py
+
+#
+all:
+	generator
+	$(CMD)
diff --git a/tests/config.yaml b/tests/config.yaml
new file mode 100644
index 0000000..9b9e3ee
--- /dev/null
+++ b/tests/config.yaml
@@ -0,0 +1,29 @@
+document: modularity-testing
+version: 1
+name: nginx
+modulemd-url: http://raw.githubusercontent.com/container-images/nginx/master/nginx.yaml
+service:
+    port: 80
+packages:
+    rpms:
+        - nginx
+testdependecies:
+    rpms:
+        - curl
+module:
+    docker:
+        start: "docker run --rm -p 80:80 nginx"
+        source: https://github.com/container-images/nginx.git
+        container: docker.io/modularitycontainers/nginx
+    rpm:
+        start: systemctl start nginx
+        stop: systemctl stop nginx
+        status: systemctl status nginx
+        repos:
+            - http://mirror.vutbr.cz/fedora/releases/25/Everything/x86_64/os/
+test:
+    processrunning:
+        - 'ls  /proc/*/exe -alh | grep nginx'
+testhost:
+    basic:
+        - 'curl localhost | grep "Welcome to nginx!"'