server command working + added tests