Updated various classes after creating integration test