Fixed development lookup to more closely resemble production development and update tests accordingly