Modified a test, made some cosmetic changes