Fixed references

Primed app for unit testing as well