Improving simulation class and adding csvread testing