Fixed enable/disable units; Add some test