Fixing startup & test issues