Added failing unit test for Issue 6 (Energy Prevents Bot Spawn)
VS Auto-fixed merge issues. Hopefully it works right!