Added some more tests + fixed a bug occuring when using FALLBACK