Remove prototype warning; add test, fork sections