Test and code clenaup