Rewritten tests to be runnable in integ and unit environment