Added a few cosmetic changes to NBMain, also restored testing structure