Amends and adds tests for Application