Added assertion statments for class