Cleaned up module initializers
Fixed tests