Slight changes + Partial integration testing