Cleaned up test output + did some fixes and tweaks