Fixed singleton for Boss
Fixed hint in test files