adding isServer variable
running tests