all except userstate compiling, added skeleton test classes