better tests + support for external server