Add configure and return tests