got tests passing need to still work on custom test