General cleanup and addition of test assets