[fix] added tests that have been lost during rebase