fixing callables and test site