Added scalatra
Fixed tests