Added test module and moved search to header in build