[#214] - fixing up tests and pulling out serve