Moved types from test file to Core project