Testing and some minor shit