Added a few more (failing) tests