Monster tests are now working
More minor code cleanups