sortimports
add charmstore server tests