Added more test coverage, fixed bug relating to externally defined component options.