Fixed issue when creating a team causing app to crash
Made a few tweaks
Updated Tests