Tests, bug fixes, added to master schematic