Added all prefixes to test + Fix