Adding test-suites

Also start of given when then and assert changes