add remainder and struct test stubs