Moved test-cases

Additional tests are W.I.P.