Added missing cascades

Also fixed tests

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>