Added a check if we start with the keyword "bundle" or "body" + unit test