Add tests that are not 5.4 compat -> Will rebase with finished code