adding support for test, server and api
adding test support