Added __selftest to main bundle, deleted separate file

Signed-off-by: JamesDeFabia <james.defabia@lexisnexis.com>