Hold off until proper unittests are in place #428