added architecture parameters; addedsome tests