Reducing complexity adding tests