Finalised test app