Fixed naming and test taking too long to run