Added test, used boost::assign