Updated with some todos
Added note about how to run server tests