Adding tests to testsuite