Added some Katana inspired tests and fixed most of them