fixed tests, added conductance support
added conductance support