Tidied tests and decoupled by swapping NormalItem use for Mock Item