Refactor specs

Signed-off-by: Ricardo Leitão <rleitao@lqd.io>