added test side stuff