Add full unittest, Finish bundle interface