Testing and bug fixing