Finished editing Tests, still have NPE
Added more debugging
More debugging