Edited it more for tests