Added a few more tests

Added tests for making sure that I am loading the right OS
Also set up the user class for the next Week.