Making test setting independent
Fixing awards bugs and adding tests