General Testing and Fixes