Added developer and fixed tests