Improved Test Functions

Things work sometimes now