Added some testing and moved some config to files