refactored tests and finished models allowing imprt of channels and programs