Added more test modules fleshed out the interface