Add test for newly added classes to keep code coverage at 100%