Testing and fixing a few issues with the application class