Added selftest