Fixed vector_test and cleaned up intermodule singleton code.